From: Kenichi Handa <handa@m17n.org>
Date: Wed, 20 Jan 2010 02:33:52 +0000 (+0900)
Subject: Fix ccl encoding of unibyte source.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8664^2~33^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=21287ddf1084d88a8e823a8aa6cf72391c2057c2;p=emacs.git

Fix ccl encoding of unibyte source.
---

21287ddf1084d88a8e823a8aa6cf72391c2057c2
diff --cc src/ChangeLog
index 74548a12d2f,8ac8883cb3e..e2dbd939b6f
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,20 +1,25 @@@
++2010-01-20  Kenichi Handa  <handa@m17n.org>
++
++	* coding.c (consume_chars): If ! multibyte and the encoder is ccl,
++	treat the source as actual byte sequence.
++
+ 2010-01-19  Alan Mackenzie  <acm@muc.de>
+ 
+ 	Fix spurious before-change-functions invocation from (insert ?\n).
+ 	* textprop.c (set_text_properties): rename parameter
+ 	`signal_after_change_p' to `coherent_change_p', and make the
+ 	invocation of `modify_region' conditional on it.
+ 
+ 2010-01-19  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+ 	* xsettings.c (apply_xft_settings): Save settings in Vxft_settings
+ 	for debug purpose.
+ 	(syms_of_xsettings): Declare xft-settings.
+ 
+ 2010-01-18  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* editfns.c (Fcurrent_time_string): Doc fix (Bug#5408).
+ 
  2010-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
  
  	* xterm.c (event_handler_gdk): Block input (Bug#5037).
diff --cc src/coding.c
index b3a51eb0c4c,b3a51eb0c4c..935d32e6a58
--- a/src/coding.c
+++ b/src/coding.c
@@@ -7417,7 -7417,7 +7417,8 @@@ consume_chars (coding, translation_tabl
  	{
  	  EMACS_INT bytes;
  
--	  if (coding->encoder == encode_coding_raw_text)
++	  if (coding->encoder == encode_coding_raw_text
++	      || coding->encoder == encode_coding_ccl)
  	    c = *src++, pos++;
  	  else if ((bytes = MULTIBYTE_LENGTH (src, src_end)) > 0)
  	    c = STRING_CHAR_ADVANCE_NO_UNIFY (src), pos += bytes;